improve compatibility with newest version