Issue #262, Issue #234