Fix sandbox issue