Fixes Issue #65.