Fix for issue caused by removing UserText helper