fixed issue with returns