Issue #328 revisited again...