two bugfixes accent 1018 and accent 1135

Hi,
Please review the 3 commits I done on Nov 27 about the above mentioned bug fix and please reply if any changes needs to be done.