Issue #078