fixing if/else not matching new ?