fix suffix: add special case of no suffix