more bug fixed