Thinking about how to fix #29