Bug resolve