Fix for latest SDK changes