Fixed issue 2 too general except in calc_rho