This seems bad that we're no longer returning the same value