Fixes Issue #206.