add a dirty trick to not to finish tagging too early