fixing #1820