Merge pull request #841 from valentinewallace/207-replacement