FIXED: 7.x - 10.x return text only was not working