Use option not actual name
(cherry picked from commit d9544a7)