* fixed NPE