oopsy, need to support legacy stuff