Refactore + fixed error in debug mode…