Fixed freeze when PATCHing