Fix backwards compatibility >_<