Corrects issue #7