Fix merging snafu

Noticed a minor error which found its way in when I was merging the upstream changes. Compiles and works fine with this fix.