Fix build, last merge was a bit broken