Finish fixing bug 2880