Working on issue #1475