Fix for SDK 4.3