removed apparently useless condition
it will need some testing at work