Addressing 1.8.7 test failure.