bug fix from merge