fix issue #1897
fix issue #1899
fix issue #1900
fix related to issue #1898