fixed for api 2.2.2