fix broken && and ||