Avoid diag moving