fixes #5189 solve reorder issue