Resolve some bug , and comment to @osaris