Added hotfix option