fix for NPE