Add the workaround with the dependency issue