added compatibility with >= frodo