Fix RangeError Exception
0.8.1