Fix merge error

This error slipped past the merge.