Added more workaround for extract depends