fixup! implement backwards compatibility