Issue #459 fix proposal