fixed a &&