Fix nullable issue