Fixed bug with cyclic reference