fixes
fixes nullpointerexception