Issue #413 fixed