Fix patch counts on resolve

Fixes #2