Make changes for compatibility with xiaoping 0.2.0.