Issue #356 was completed