ticket #6 fix#1