Working on issue #957