Fix for annotation form