hotfix NPE