tb more bug fixed