bug fix from previous merge