fix compatibility with 0.5.18