diff --git a/roboniggers.sp b/roboniggers.sp
index cfefa74..a8a4c61 100644
--- a/roboniggers.sp
+++ b/roboniggers.sp
@@ -18,7 +18,7 @@ public void OnMapStart() {
 
 public void OnPluginStart() {
 	HookEvent("post_inventory_application", Event_SpawnNigger, EventHookMode_Post);
-	HookEvent("round_start", Event_ReplaceBomb);
+	//HookEvent("round_start", Event_ReplaceBomb);
 }
 
 public void AddFemPyroToDownload(bool:logging){
@@ -195,8 +195,7 @@ public Action:ChangeWatermalon(Handle:hTimer, any:data) {
 	int ent = -1;
 	while ((ent = FindEntityByClassname2(ent, "item_teamflag")) != -1) {
 		if (IsValidEntity(ent)) {
-			SetVariantString("models/props_junk/watermelon01.mdl");
-			AcceptEntityInput(ent, "flag_model");
+			SetEntPropString(ent, Prop_Data, "flag_model", "models/props_junk/watermelon01.mdl");
 		}
 	}
 	if (ent == -1) PrintToServer("Cannot find bomb");