Message fixing bug and add feature clone