Bug resolve

Bug resolve