Issue #473 fixed