Fix for SDK 0.5.13