Actually broke future compatibility with last patch, fixing that