Fixes Issue #98.