Prevent unique error when going twice through finalize step