Put suffixing back - with debugging