Make ETS operation safer