Fix NBS Provider