Nasty fix for OR operator being applied instead of AND