Fix possibility of duplicate annotations