Flags correction - step 1