[james] #X partial fix for failing functional test