Fix [3588364] (hopefully)
merge-mark