Further bug fix