Hi Michael! I see you have refactored the controller code in CL 2053342 
I have merged it into my forked 4.1 github branch and tested it. Works really well. I’ve sent you a pull request. Hopefully it’s okay and you accept it… I really needed that fix now Thanks!
Tommy.