Fixed annotator and covered with a test