Fix for NPE