Addresses Issue #202.

There's probably a deeper underlying issue, but I've got 99 problems and fixing this ain't one!