Yet another modify_request fix