Fixed nasty bugs in reply