Thanks @Matroskeen for the patch, committed the patch and closing the the issue.