fixed NPE, again..hopefully