Issue #567 completed