Issue #402 - fix bug