Fixed cycle in dependencies