Fix arrange stage