Let's fix this another PR (needs discussion).