Fix merge conflict from morcmarc's pull request