Fix for names with ; &