fixed prevent issues