+1 Nice backwards compatibility check