A way to mitigate #42.