Corrected mistakes with annotations I made in previous commit