patch undertaker choice handling