Attempt workaround apple bug related to issue #269