ticket #1 fix#3