fixed NPE, hopefully