Fixed cyclic deps