fixes #1210

I decided to go with the simple commit in the end.  There are a bunch of other issues I started covering, but I think they deserve their own tickets.