Working on issue #947