Fix ordering in init