Thanks @matroskeen for the patch, applied and fixed, closing the issue.