Quick fix for ampersand problem

Quick fix #3404 
Not a long term solution, but a solution anyway