removed extra check