fix after api changes