test fix
(cherry picked from commit 1f6327d)