Bug fix on line 21