Fixed small bug, changed from && to ||