Restore compatibility with 4.02