Workaround for issue #330