Fix for GPUs