null point bug fixed