Issue #44: Annotations don't get disordered..