Changing order of logic inside constructor.
Changing order of logic inside constructor.

NicolasSchnitzler/dtk,d-tk/dtk,rdebroiz/dtk,d-tk/dtk,d-tk/dtk,rdebroiz/dtk,NicolasSchnitzler/dtk,d-tk/dtk,rdebroiz/dtk,NicolasSchnitzler/dtk,d-tk/dtk,rdebroiz/dtk,NicolasSchnitzler/dtk,d-tk/dtk