Windup 222 - Added the lost commit

I don't see where this change made it in before the merge... hmm... feel free to send it as a new PR.