fix compatibility with 2,3