Nullable support (small fix)