Fix for return