#53 return fix