Language Switch as last item in menu inherits custom class names

I am trying to customize Menu items and am using WPML for translations in a Custom Timber Theme.
When we add a custom class to the last item in the menu, and have the language switcher set to display in the menu at the end, the Language Switcher inherits the classes from the previous menu item.

When we debugged the issue :
In the File, wp-content/plugins/timber-library/lib/Menu.php
There is a function, order_children.
That checks if the menu items is a WP_Post and an object.
The Language Switcher is not a WP_Post and fails.
The LS menu item then inherits the previous post classes.

We made a small modification to properly set the LS
https://screencast.com/t/RUVuASo0
I don’t think this is the solution and would like to have at the plugin updated to properly handle the Language Switcher and CSS Classes.

Note: I posted a similar issue to the WMPL forum.

The page I need help with: [log in to see the link]