Fix issue #2058
fix issue #2060