Working on issue #1574