fix Issue 2117