BugFix Compatibility with API 10