Fixed #859

I *think* that this should do it.