Fix for latest SDK