diff --git a/include/osg/CoordinateSystemNode b/include/osg/CoordinateSystemNode
index ef5f7cd1b..04918d237 100644
--- a/include/osg/CoordinateSystemNode
+++ b/include/osg/CoordinateSystemNode
@@ -158,7 +158,7 @@ inline void EllipsoidModel::convertXYZToLatLongHeight(double X, double Y, double
 {
     // http://www.colorado.edu/geography/gcraft/notes/datum/gif/xyzllh.gif
     double p = sqrt(X*X + Y*Y);
-    double theta = atan(Z*_radiusEquator/ (p*_radiusPolar));
+    double theta = atan2(Z*_radiusEquator , (p*_radiusPolar));
     double eDashSquared = (_radiusEquator*_radiusEquator - _radiusPolar*_radiusPolar)/
                           (_radiusPolar*_radiusPolar);
 
diff --git a/src/osg/CoordinateSystemNode.cpp b/src/osg/CoordinateSystemNode.cpp
index c4af22144..343238066 100644
--- a/src/osg/CoordinateSystemNode.cpp
+++ b/src/osg/CoordinateSystemNode.cpp
@@ -51,10 +51,6 @@ CoordinateFrame CoordinateSystemNode::computeLocalCoordinateFrame(const Vec3d& p
         double latitude, longitude, height;        
         _ellipsoidModel->convertXYZToLatLongHeight(position.x(),position.y(),position.z(),latitude, longitude, height);
         _ellipsoidModel->computeLocalToWorldTransformFromLatLongHeight(latitude, longitude, 0.0f, localToWorld);
-        
-        osg::notify(osg::INFO)<<"lat="<<latitude<<"\tlong="<<longitude<<"\theight"<<height<<std::endl;
-    
-        //_ellipsoidModel->computeLocalToWorldTransformFromXYZ(position.x(),position.y(),position.z(), localToWorld);
 
         return localToWorld;
     }