CUDA, temp fix, to remove