Issue #199 - untested, but should fix it.