Circular substitution fixed