fix #34921
fix #35001: Repeat Count does not work on a single measure