Fix backwards compatibility with previous versions