Fixing quoting of pairs