Compatability for base-4.2.0.0