more bug fix++