Bugfix no longer required
Merge branch 'fix-nvidia'