fixed early exit case