Can you see if this patch fixes it? https://gist.github.com/karolherbst/3cde7028a6b885ca42863b6f6320658c