Working on issue #1724