This now seem to work, but obviously needs more rigirous testing to confirm that it doesn't fuck up.