Return too soon bug