Another attempt to fix the dependency issue