Fixing quotes problem