Reviewed and tested the patch from #26
The length has been increased

Updated...