Issue: 441 - Remove extra gsub