Fixed reply bugs