adjust to package changes