Return without return fix