fixed missing AND