Manage text-overflow

A quick solution to fix #684