[BUGFIX] Actually fix the previous commit