Fix to #7 but will not merge until results issued