Fix GPA Evaluate bugs