nullable bug fixed