This should once and for all correct issue #328