fixed conflicts with new core