Fix sandbox selection