Another bug fix from previous commit