Begin fix line number bug