Corrects issue #328