ticket #1 fix#4