fix ticket #8