Working on issue #1549