Fixed bug on line 137