Final fix for return