Fix for NVC support