Ordering fix in add()