Fix to previous Flag fix