improve backwards compatability