Really fix broken option length check