pick null bug fix