Issue #6 & Issue #26