Fix for munged annotations