* Continued fixing bugs for too long names