bug with && fixed