ticket #5 fix#5