Correctly server side patch handling
I\m sure I fixed something