Issue #381 fix