ticket #5 fix#6