fix some bug version 1