@plapier please take a look at 087c92317d93a88a409f24bc4109d005800a95e3. I can revert it if you like the previous version better. :)