Previous change to use a flag will resolve this.