Fix: Accidentally undid part of a previous commit