Support SDK 2.1.4