fix ticket #931