Update for 4cdn, maybe fix issues like #219?