fixed ampersands