Bug fixing: Annotations