Return correct structore on revert