added nulable=1 fix