removed extra condition