[WIP] Fixed #253 - Prevent patch step from being interrupted

It happens in `sync.end()`