Fixed bug line 126