I agree with the proposed solution . Added a patch.