Issue #73, #74.