Roll back to old version, fix code