I implemented a fix in the current codebase and will submit a pull-request
See fix in action on this video.