some bug fixed.