SDK 1.9.1 compatibility