Fix: Firm's safeDelete function fixed