Fixes #5190
Merge pull request #5206 from mwerezak/shoe-cuffs

Fixes #5190