fix, null pointer expetion