Fix for test from Eric (we should rework this around the API)