Fixes Issue #5.