Fixed another remaining merge issue, hopefully the last.