modify for Core change