Fixes #211 - TextReplacement

Change-Id: I52ed7809ede4d0843bafad66d56165247ce19ca7