Temporary fix for tree layout cycle bug