ticket #1 fix#2