ticket #5 fix#3