Patch collection to work with Jpmobile encoding issues.