More bug fix