Working on issue #1689
Closes issue #1689