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

TODO