fixed the nullable object bugs