Fixing issues with returns