FIX: Fix init order
Merge pull request #362 from Eric89GXL/fix-init

FIX: Fix init order