[all] Issue #627 fixed