Fixed && and ||