modify for Core change;