fixed NPE