Issue #434 fix bug