Fix Patrick's mess
Merge pull request #6118 from guardian/fix-patricks-mess

Fix Patrick's mess