[#66][#74] Corrections