Bug fix on lines 2