fix backwards compat issue with master