Some changes for same iderror