If possible could you add a test around this stuff. I realise I have commented out the tests on the other issue trackers, but am fixing them now