Bug revert annotator order