Workaround for issue 3068