try to fix some bug