Sergey Astakhov, could you take a shot at creating a pull request with a test case and your suggested fix?
Thanks!
Gail