Fixes suffix removal for fields that use them