Fixed error caused by merging (and not noticing missing lines, derp).