fix backwards compatibility