Patch for some backwards compatability