Fix - quoting still wrong