Fixes Issue #77.