[Fix] Bug on order of calling hooks

Changes

Change Type

Bug fix (Not breaking change that fixes a bug)

Screenshot

Checklist:

My code follows the defined guidelines
I reviewed and tested my code
My changes don't cause new warnings
My code has relevant tests
My unit tests are passing