From the provided file I have created a patch that I have committed in a bugfix branch, see [ed31b70d26].

The result looks OK to me.