Fixed a bug where  annotations were ignored