fixed callback and null