fix Issue2104
fix issue2100