[FIX] Fix a fix that was not fixed at it should be. But it's now fixed
:p