fixed tools:replace issues in the consumer's code