Hotfix NPE