Fixed: Undefined variable
(cherry picked from commit 69b5b92)