fixed long names issues