issue #954
issue #930