Some annotations were removed in the previous commit, it was wrong
and it must be readded.