Dependency issue fix