Thanks, @sah62 for the patch.
The patch at #2 looks fine to me and it's worki...