diff --git a/BeefLibs/corlib/src/IO/BufferedStream.bf b/BeefLibs/corlib/src/IO/BufferedStream.bf
index 24c0afd4..8fc12e57 100644
--- a/BeefLibs/corlib/src/IO/BufferedStream.bf
+++ b/BeefLibs/corlib/src/IO/BufferedStream.bf
@@ -179,7 +179,12 @@ namespace System.IO
 
 		public override Result<void> Close()
 		{
-			return Flush();
+			let ret = Flush();
+			
+			mPos = 0;
+			mBufferPos = -Int32.MinValue;
+			mBufferEnd = -Int32.MinValue;
+			return ret;
 		}
 	}
 }
diff --git a/BeefLibs/corlib/src/IO/FileStream.bf b/BeefLibs/corlib/src/IO/FileStream.bf
index 6ffd0e44..c193b610 100644
--- a/BeefLibs/corlib/src/IO/FileStream.bf
+++ b/BeefLibs/corlib/src/IO/FileStream.bf
@@ -371,14 +371,14 @@ namespace System.IO
 
 		public override Result<void> Close()
 		{
-			var hadError = Flush() case .Err;
+			let ret = base.Close();
 			if (mBfpFile != null)
 				Platform.BfpFile_Release(mBfpFile);
+
 			mBfpFile = null;
 			mFileAccess = default;
-			if (hadError)
-				return .Err;
-			return .Ok;
+			mBfpFilePos = 0;
+			return ret;
 		}
 
 		protected override void UpdateLength()