Fix underscore replacement to replace multiple times