ignore me at #2575 - I seem to have fixed it with some more random fiddling