Bug list fixed