Issue #176 fix attempt