null pass fix