0.9 Compatibility break fix