fixed doubled &&