Attempt fix for @wanze issue #409