Rapid and smart fix