Issue #470 completed