This should solve the issue. Hopefully, it should be merged soon.
Sorry for the inconvenience, and thanks again for the well-documented bug report.