removed inappropriate "return"