Fix Accidental yanked line, and fix ISSUE #2