More bug fix ...