more bug fix