hopefully fix nullpointer, through web edit :)