Flag Issue Fixed