fix reply handling


@jancborchardt @jakobsack @Gomez please test and review - THX