Issue #466 completed