Fixing UserText related issue