Update and but fix