Correction for core lib