Updated proposed solution in the issue summary