Find Bug issue Fix