Fix scorer (for real?)