actually fixed the nullref :P