Nullable types issue fix