quick fix for NPE