Fixing cyclic dependency