fix bug null pointer deference...