diff --git a/include/omath/projection/camera.hpp b/include/omath/projection/camera.hpp
index 4fca833..8b3a2c6 100644
--- a/include/omath/projection/camera.hpp
+++ b/include/omath/projection/camera.hpp
@@ -84,8 +84,7 @@ namespace omath::projection
         [[nodiscard]] Mat4X4Type calc_view_projection_matrix() const noexcept
         {
             return TraitClass::calc_projection_matrix(m_field_of_view, m_view_port, m_near_plane_distance,
-                                                      m_far_plane_distance)
-                   * TraitClass::calc_view_matrix(m_view_angles, m_origin);
+                                                      m_far_plane_distance);
         }
 
     public:
@@ -244,7 +243,7 @@ namespace omath::projection
         {
             const auto& raw_array = ndc.raw_array();
 
-            if (raw_array[2] < 0.f)
+            if (raw_array[2] < 0.f || raw_array[2] > 1.f)
                 return true;
 
             for (std::size_t i = 0; i < 2; i++)