I would say this PR is ```refactoring`` instead of ```fix```. But anyway your solution is better and lines 2310, 2390 should be removed.