Fixed cyclic references issue