core 3.0 fix