FIX Bug if the name is too long. #5