fixed ampersand bug