Fixes #5525
Merge pull request #5535 from Perakp/onlyOne

Highlander fix