ticket #3 fix#2