Papewaios edit will stop them for. A quick fix until there's a final solution.