Fixed potential bugs with andMove and orMove being called.