Partially fixes Issue #22