Small bug fix attempt, number 2