Fix of the broken fix commit of the broken commit... but now it is definately working. Sorry again.