Fixed the issue about null values