Reimplement Suppress logic bug

Reimplementation of cc31bf0cbdd7370930717fd3dc431ddd9f1535b2 that's been mistakenly overwritten