Improving stock fixing bugs