However, we still cannot select the full scale.

Close #6603 and #6602
(cherry picked from commit 5deeed2ecd91ca2634fa2e657a8a887e274c226d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>