Minor bug fix from merge