Fixed annotations vol. 2