Fixing bug COG-697.