Working on issue #954