Fix arbitary length
Merge pull request #602 from NickSampanis/602

Fix arbitary length