Correct some behaviors

As the first version come from our internal development for a specific case, all cases are not supported.

We try to resolve this to release the 1.0.1 version.