Fix for nic changes.