Annotations fix