Bug Fix in Main Line