Fixes Issue #2.