Bug789 v1.6 part2

Fix CUDA build.