Fixed to be backwards compatible