Fixed issue with comment text not being picked up