Fix type null