[#61] Correct mistakes