diff --git a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
index 23c2fe029..a27712c7f 100644
--- a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
+++ b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
@@ -1,5 +1,6 @@
 package net.sf.openrocket.preset.xml;
 
+import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Collection;
@@ -22,6 +23,10 @@ public class OpenRocketComponentLoader  implements Loader<ComponentPreset> {
 	public Collection<ComponentPreset> load(InputStream stream,	String filename) {
 
 		log.debug("Loading presets from file " + filename);
+		
+		if ( ! (stream instanceof BufferedInputStream) ) {
+			stream = new BufferedInputStream(stream);
+		}
 
 		try {
 			List<ComponentPreset> presets;