Address unsequenced modification warning, fixes #6562