Issue #389 fixed