Fixing bug 5127