Implemented dirty version hack