Implementation for Issue #74