Fixed early return