Fix subject matching with multiple class subjects