diff --git a/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java b/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java
index a677190f69..c4999d5134 100644
--- a/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java
+++ b/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java
@@ -143,14 +143,19 @@ public class NoteBlockEvent extends BlockEvent
         BASSDRUM,
         SNARE,
         CLICKS,
-        BASSGUITAR;
+        BASSGUITAR,
+        FLUTE,
+        BELL,
+        GUITAR,
+        CHIME,
+        XYLOPHONE;
 
         // cache to avoid creating a new array every time
         private static final Instrument[] values = values();
 
         static Instrument fromId(int id)
         {
-            return id < 0 || id > 4 ? PIANO : values[id];
+            return id < 0 || id >= values.length ? PIANO : values[id];
         }
     }