Fixes Issue #17