Untested but this should fix the return command