f65dd213
2534c16b
dfe0d9a0
* commit 'f65dd213900603116c7b064bfdfb57662f7682c3': Change order of operations so flag is not overwritten