Fix bugs in v4.0.1.11