Fix order of constructor params