Fixed bug on line 429