[fix] make it work with new framework changes