Remove first matched suffix

The loop w/ the method group was causing problems when adding the same
suffix multiple times