Issue #166 - fix implementation