Fix for b1121a315205e8152d9c59199443c492340e9f0b.
That did not work in Bjoern's setup for reasons that still are eluding me - but this variant works and is less hacky, more readable anyway.