Fixed cyclic reference issue