A possible solution to #68