Fix #246

why there was || and now &&?