I1867

Fixes #1867

@hmelman likes giving us more work to do. This was an easy one, and I wanted to show it to him so he could practice with Swift. Hehe ;-)