Bug fixing in the annotator