Workaround for issue #9