ticket 99001 fix bug