Actually this is probably better as an issue on github