Dirty fix for request structure change.