BZ 1070242 - opps, put it in the wrong if statement