Partially fixes Issue #27