comply with api changes