corrected return bugs