Untested solution to #77