Fix null to nil