Fix issue #206. This is probably just as good.