Fixed here:
Please give it a test. If all is well I’ll cherry pick the change to the master branch too.
master