ticket #3 fix