Removed redundant flag setting