Bug fix on bug fix