First try, workaround for issue 6086