Quick fix for ampersand problem
Merge pull request #3464 from yakky/feature/amp_quick_fix

Quick fix for ampersand problem