#30 Fix nullable column