adapt to core changes