a workaround commit, with minor fix on nvidia