FYI @cagapopo @rmatev
I was able to reproduce the problem and fix offline. This should work. Feel free to merge.