adapt to latest cling master