Add fix for ampersand bug.