Avoid early exit (not really sure how to solve this)