Fixing bug 5135