Did a substr hack and got it working
Fix commit- did a substr hack and got it working