Accommodate ZK 3.5.0