Revert "Flags fixed"

This reverts commit e9f6d4d4f19002e5d7051d07783eef56205f57b6.