Hotfix design