Started to work on a fix for long names.

Ref #100