more bug fix pull