- fixed NPE