Fixed suffix logic. Fixes #5