Fixing bug for will