Fixes Issue #22.