working on a fix provided by @asalme .