I know this is a hack but I still have no ideas about what to do without using this flag.

If I have any better idea, I will comment back here, thanks Arthur.