Fix: accidentaly reverted twice or something.
This should be handled by the core itself so I'm leaving it as it was