Avoid extra