ticket #5 fix#1