Bug patch(master changed)