fixed after rest api changes