Hopefully resolved compatibility issues with multiple conditions in if.