Provide a workaround for issue #1