fix issues with annotations