Thanks Florian for the bug report, luyikei for the initial code patch, and Bouke for the code review feedback.