(hopefully) fixed nullpointer