Partially fixes Issue #4