of course removed the wrong conditional, put it back in