Sandbox fix. #2833