Fix test failure
Make sure change is backward-compatible