removed extraneous check