Issue #24 and issue #26