compatibility with 3.1.0.1