Bug fix for %2C