Potential solution to #29