Created patch to fix bounce processing