Fix no response bug