Thanks @devd for helping out with the patch.