Fixed for forthcoming 1.4 deprecations