Forgot one merge

Missed one!