adapt to framework changes