Temporary workaround for issue 2820