added hot_fix1 to fix bug1