Working on issue #1074