JM-140: Proposed solution to the disputed problem

Comments