Temp fix for NPE