Fix of the fix of the fix of the...

Damn it. This time it should be correct.