Bugfixed for the SDK