Fix setup to new version