Fixed prevent issues