workaround issue #6