Fixes Issue #14