Improve timing in BWV 1030