Fix some bug, close regist