Fixed problems with annotations