[#43] Further corrects