ticket #5 fix#4