minor changes after previous bug fix