Issue #372 fixed