Another bug fix attempt