nullPointerException (hopefully) fixed