bug1 fixed.