davawen

This should be fixed, issue can be closed :)

It seems the linked PR has been closed, so perhaps a fix can be merged ?