Fixing truncation in case of empty name