Fixing Init order