Fix for minor snafu in rebase