Fix patch collision
Merge pull request #8 from yohanboniface/fixes

Fix patch collision