Core/Commands: Fixed again