Wrong return fix