sandbox handling changed again