Fix quit relaying issues