fixed CleanupStack