Compatibility fix for Eden and Frodo