Make sure we add row before removing tables