Fixes #5336
Merge pull request #5421 from mwerezak/attack-by-fix

Fixes #5336