Don't add duplicated suffix

Fixes #383