Fixed #210 - I think
un-isolated test for #210