Occasional notice about $return not working