Fix attribute order