Added hooks for hotfix