Fixed conditional syntax to use and instead of or