Don't quote the segment twice.. Fixes #4246