GPU Fix Phase #2