Nullable columns fix