Fixed if/else issue with '&&'