- addresses issue #1839