Issue #375 completed