diff --git a/lib/Ray/sources/Audio/Music.cpp b/lib/Ray/sources/Audio/Music.cpp
index bba2da21..09e7b540 100644
--- a/lib/Ray/sources/Audio/Music.cpp
+++ b/lib/Ray/sources/Audio/Music.cpp
@@ -36,7 +36,7 @@ bool RAY::Audio::Music::unload(void)
 
 bool RAY::Audio::Music::isPlaying(void)
 {
-	return IsMusicPlaying(_music);
+	return IsMusicStreamPlaying(_music);
 }
 
 RAY::Audio::Music &RAY::Audio::Music::play(void)
diff --git a/lib/Ray/sources/Vector/Vector3.cpp b/lib/Ray/sources/Vector/Vector3.cpp
index 75f252c8..b201f144 100644
--- a/lib/Ray/sources/Vector/Vector3.cpp
+++ b/lib/Ray/sources/Vector/Vector3.cpp
@@ -8,12 +8,12 @@
 #include "Vector/Vector3.hpp"
 
 RAY::Vector3::Vector3(float X, float Y, float Z):
-	Vector2(X, Y), z(Z)
+	x(X), y(Y), z(Z)
 {
 }
 
 RAY::Vector3::Vector3():
-	Vector2(0, 0), z(0)
+	x(0), y(0), z(0)
 {
 }
 
diff --git a/lib/Ray/sources/Vector/Vector3.hpp b/lib/Ray/sources/Vector/Vector3.hpp
index 75fb6567..6b847ebe 100644
--- a/lib/Ray/sources/Vector/Vector3.hpp
+++ b/lib/Ray/sources/Vector/Vector3.hpp
@@ -8,11 +8,11 @@
 #ifndef VECTOR3_HPP_
 #define VECTOR3_HPP_
 
-#include "Vector/Vector2.hpp"
+#include <raylib.h>
 
 namespace RAY {
 	//! @brief A Three-dimensionnal Vector data type.
-	struct Vector3: public Vector2
+	struct Vector3
 	{
 		//! @brief Vector 3 constructor
 		//! @param x x-value of vector, such as a width
@@ -39,6 +39,10 @@ namespace RAY {
 		//! @brief A RAY Vector3 is cast-able in libray's Vector3
 		operator ::Vector3() const;
 		
+		//! @brief X value of vector
+		float x;
+		//! @brief Y value of vector
+		float y;
 		//! @brief Z value of vector
 		float z;
 	};