Fix sandbox bug