Fix uniform-draw annotations