some fixes of receiving before delivering