[#24] Fixed type