Sdk2.8 fix