diff --git a/src/SFML/Window/Cocoa/Joystick.cpp b/src/SFML/Window/Cocoa/Joystick.cpp
index 4ade09c4..ff2a353a 100644
--- a/src/SFML/Window/Cocoa/Joystick.cpp
+++ b/src/SFML/Window/Cocoa/Joystick.cpp
@@ -55,12 +55,11 @@ JoystickState Joystick::UpdateState()
 
 
 ////////////////////////////////////////////////////////////
-/// Get the number of axes supported by the joystick
+/// Check if the joystick supports the given axis
 ////////////////////////////////////////////////////////////
-unsigned int Joystick::GetAxesCount() const
+bool Joystick::HasAxis(Joy::Axis Axis) const
 {
-    // Return number of supported axes
-	return 0;
+	return false;
 }
 
 
diff --git a/src/SFML/Window/Cocoa/Joystick.hpp b/src/SFML/Window/Cocoa/Joystick.hpp
index 42590751..60c5db24 100644
--- a/src/SFML/Window/Cocoa/Joystick.hpp
+++ b/src/SFML/Window/Cocoa/Joystick.hpp
@@ -58,13 +58,15 @@ public :
     JoystickState UpdateState();
 
     ////////////////////////////////////////////////////////////
-    /// Get the number of axes supported by the joystick
+    /// Check if the joystick supports the given axis
     ///
-    /// \return Number of axis
+    /// \param Axis : Axis to check
+    ///
+    /// \return True of the axis is supported, false otherwise
     ///
     ////////////////////////////////////////////////////////////
-    unsigned int GetAxesCount() const;
-
+    bool HasAxis(Joy::Axis Axis) const;
+	
     ////////////////////////////////////////////////////////////
     /// Get the number of buttons supported by the joystick
     ///