get proper replacements in some extreme cases
Merge pull request #9 from jaumeortola/master

Get proper replacements in some extreme cases.