Issue 2172

fix #2172