fixed compatibility with Eden