partly fix on changes in dependencies
trying to fix erors due to changes in dependencies