compatibility with 0.10.13