diff --git a/container/FIFO.h b/container/FIFO.h
index 889d2ade..f70c78b0 100644
--- a/container/FIFO.h
+++ b/container/FIFO.h
@@ -70,13 +70,8 @@ public:
 	}
 
 	ReturnValue_t pop() {
-	    if(empty()) {
-	        return EMPTY;
-	    } else {
-	        readIndex = next(readIndex);
-	        --currentSize;
-	        return HasReturnvaluesIF::RETURN_OK;
-	    }
+		T value;
+		return this->retrieve(&value);
 	}
 
 	static const uint8_t INTERFACE_ID = CLASS_ID::FIFO_CLASS;