Fixed scoring logic