Hopefully mitigate #61 somewhat