Update suffix to only add  if last char is alphanumeric - fix #145