improved workaround for issue #12