Latest version fix