ticket #5 fix#2