Fixed an issue with annotations