stuff
fixed NPE, hopefully