Issue #395 fixed