Fix #44 for real (remove variable length limit)