Try to fix failure after test

(cherry picked from commit c7a3aa6)