Changed finish behavior of bugs