potential solution to #73