diff --git a/libraries/FastSerial/BetterStream.cpp b/libraries/FastSerial/BetterStream.cpp
index 38e12fa7a9..e8cb7b97be 100644
--- a/libraries/FastSerial/BetterStream.cpp
+++ b/libraries/FastSerial/BetterStream.cpp
@@ -54,8 +54,8 @@ BetterStream::_printf_P(const prog_char *fmt, ...)
 }
 
 int
-BetterStream::space(void)
+BetterStream::txspace(void)
 {
-        // by default claim that there is always space
+        // by default claim that there is always space in transmit buffer
         return(INT_MAX);
 }
diff --git a/libraries/FastSerial/BetterStream.h b/libraries/FastSerial/BetterStream.h
index d782a0966e..791075ad4d 100644
--- a/libraries/FastSerial/BetterStream.h
+++ b/libraries/FastSerial/BetterStream.h
@@ -28,7 +28,7 @@ public:
         void            _printf_P(const prog_char *, ...);
                 __attribute__ ((format(__printf__, 2, 3)));
 
-        virtual int     space(void);
+        virtual int     txspace(void);
 
 #define printf_P(fmt, ...) _printf_P((const prog_char *)fmt, ## __VA_ARGS__)
 
diff --git a/libraries/FastSerial/FastSerial.cpp b/libraries/FastSerial/FastSerial.cpp
index 84015d142f..5ee8ad3ee8 100644
--- a/libraries/FastSerial/FastSerial.cpp
+++ b/libraries/FastSerial/FastSerial.cpp
@@ -142,13 +142,6 @@ int FastSerial::available(void)
 	return ((_rxBuffer->head - _rxBuffer->tail) & _rxBuffer->mask);
 }
 
-int FastSerial::space(void)
-{
-	if (!_open)
-		return (-1);
-	return (((_rxBuffer->tail - _rxBuffer->head) & _rxBuffer->mask) - 1);
-}
-
 int FastSerial::txspace(void)
 {
 	if (!_open)
diff --git a/libraries/FastSerial/FastSerial.h b/libraries/FastSerial/FastSerial.h
index 11dd04ff24..920554555f 100644
--- a/libraries/FastSerial/FastSerial.h
+++ b/libraries/FastSerial/FastSerial.h
@@ -110,7 +110,6 @@ public:
 	virtual void begin(long baud);
 	virtual void end(void);
 	virtual int available(void);
-	virtual int space(void);
 	virtual int txspace(void);
 	virtual int read(void);
 	virtual int peek(void);