I added a much smaller patch now, the big patch should be deleted now.