diff --git a/source/Layer.cpp b/source/Layer.cpp
index e451269..4ad7f3d 100644
--- a/source/Layer.cpp
+++ b/source/Layer.cpp
@@ -161,7 +161,7 @@ Json::Value Layer::toJson() const
 	layer["weights_file"] = m_weightsFile;
 	layer["numVisibleX"] = (int)m_numVisibleX;
 	layer["numVisibleY"] = (int)m_numVisibleY;
-	layer["numHidden"] = (int)m_bhv.n_elem;
+	layer["numHidden"] = (int)whv().n_cols;
 	layer["rbm"] = Rbm::toJson();
 	
 	return layer;
diff --git a/source/Layer.hpp b/source/Layer.hpp
index 1678d0a..8923092 100644
--- a/source/Layer.hpp
+++ b/source/Layer.hpp
@@ -64,7 +64,7 @@ public:
 	
 	int numHidden()
 	{
-		return m_bhv.n_elem;
+		return whv().n_cols;
 	}
 
 	arma::mat trainingData(arma::mat const &batch)
diff --git a/source/Rbm.hpp b/source/Rbm.hpp
index 5158c31..8c971c3 100644
--- a/source/Rbm.hpp
+++ b/source/Rbm.hpp
@@ -161,11 +161,11 @@ private:
 protected:
 	arma::mat m_bhv;
 	arma::mat m_bv;
-	arma::mat m_ctx;
 
 private:
 	noise_gen_t m_noise;
 	arma::mat m_whv;
+	arma::mat m_ctx;
 	
 };