ooops, fix backwards compatibility here