Possible workaround for a problem in issue #15