fixed issue of null type