Fix wrong order in initialization code - again