Bug fix
(cherry picked from commit f030ffe75522d2c6a8788f9efd1a3fb93cb60d72)