Fingering problem in BWV 936 in D-major

[iskia]

With thumb in C, it's really hard to play the last note E fluently. My workaround is to release my thumb from C for E.

Any suggestions?

[faulty_damper]

Try 5A-4B-5A-4G-3F-2D.