updated for api-27 fix