Core/Unit: Fix last commit