Fix for annotation