Rebuild with quotes