Fix backwards compatibility