fixed null to quotes?