Fixing for dependency cycle.