Fix problem with [Corrected] tag sometimes missing

Fix and then refactor.