Possible solution to #47