Workaround for issue 4709