null bug fixed