- some code used to test if only this flag is set, some if also this flag is set. This change unifies the test