Fixed circular inclusion
merge