Fix weight ordering