Issue #388 - fixing implementation