First line bug fix