A better way of addressing issue #84. See comments there