fix some bug 09/06