Fix boolean order