Fix #2273
Merge pull request #2274 from ckdarby/patch-1

Fix #2273